remove lots of unused files, handle where that equal tbd