remove unused UNIQUE_COLUMN_HEADER
put base classes inside one module