Remove def'ed out code

Mostly inline testing/debug stuff