got rid of some code