Last cleanup before extraction and deprecation