Remove print
Remove commented-out code