Final clean of element loading code.