Deprecate and cleanup #2