Deprecation and docs adjustments