Remove master side masterstate routines per #963