removed commented out code and notes