major rework
removed old database