Attempt to remove the old master/slave system