Removed commented code and