Add deprecation note.
Remove un-needed macro.