Refactoring. Delete not need code