deprecation cleanup
moved to core-api