removed Database abstraction