remove unused class
remove unused class
Refactoring to abstract DB
Refactoring to abstract DB