Bug 936222: clean up old, unused nextSlave functions. r=rail