CLEANUP: take out redundant paths in header and delete unused files