Removing some commented out code and debug prints