Continue refactor to base class
Continue refactor to base class
More refactoring of names and deleting unused files
Remove commented out code
More refactoring
More refactoring with filters