Refactors out unused methods