Removed unnecessary commented code