Misc cleanups. Fix bug where after-auth routes were being loaded twice.