remove used files, update refactor