Deprecation, docs, etc