Remove useless workaround and fix some bad cuts and pastes