Some gem cleanup