reverting revert
removed commented code