Pruned code that was accidentally added in a conflict merge
Removed no-op tests.