This patch includes all of the callback work for setting clone() and cleanup()