Removing all unnecessary allocation functions