Deleted some more old functions