Add back clearance/testing with deprecation message