CLEANED UP: deleted dead code.