Cleanup.
Added a deprecation macro.