Strimmed down unnecessary gems