Documentation updates.
Removed some unused macros.