Remove base class
More refactoring on application