Cleaning up some dead code