remove comments, reformat, rename
remove routing code