Minor cleanup, unused methods taken out