Remove bad code changes