delete many terribly named and unused methods