clean up of comments and old commented out code