Remove chruby code added during merge