got rid of some commented sections