Cleanup and deprecate