Improving some routes. Removing obsolete ones.