Removed commented code and debug statements