move files
remove dead code