refactored. routes removed