remove unused code
remove more comments
moved setup logic into the router