Removed all of the variables relying on new behaviour instances being created.