refactor, remove unused files