removed some unclean code.