removed unnecessary commented code