Cleaned up some dead/commented in patches.