removed unnecessary logic from routes