smal refactoring remove not needed trash