DB cleanup: added proper tasks to clean up the database