Adding cleanup on the database