More code towards freeing old actions