got rid of comments and unused code