[MISC] Cleanup for release.

Commented out some WIP blocks and such.