cleaned up useless features/methods