Revert "Fixing Routes"

This reverts commit ba60864c5c02f9988c483c9a172998798823dfff.
Revert f57aae5..f54d60e

This rolls back to commit f57aae58fe296082e173c0f8d37f3775bb8efaba.