remove file not in use, add TODOs