cleanup some routing and unused methods