even more deleting
adding database logic