Cleaning up the core model constructs