Refactoring, removing old forgotten dbclass