Removed extra templates and routes