refactoring, remove garbage #17