cleanup terms used within the behaviour model
cleanup resource types and producer/consumer wrappers