These have been unused since UMS support was ripped out, so lets remove
them completely.
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>