Remove some commented out, and #if 0'd code