Delegate changes to cleanup memory correctly