Replaced more macros.
Removed dead macros.