Deleting more old code