removing commented-out code, documentation