Refactor & delete unused routes