Merge "Removed unnecessary commented code"