Removed DB cleanup