deteleted unused modules, abstracted database for eventual pool use (if necessary)