Refactoring. Remove garbage