misc comments and cleanups
remove unused code
test cleanup, more default routes