Minor cleanup and removal of dead code experiments.