Yet more gem cleanup