fix for refactoring and removing unnecessary classes