Internal compliance, more deprecations