cleanup DeployContext code (and some other types), stop using data-default