Route & code cleanup