finiah refactoring remove usless code