clean up commented-out code, printf spam