Fix member variable name alignments
Remove unused macros and documentation for them.

They're useless.
Remove unused code.

Maintaining these is a pain in the ass, they're going away.