Removing all calls to clone etc