removed some needless ops