Refactoring + remove useless file