Removed some old code and commented out some debug print statements.