This should go away with the innerhtml thingy