And remove some obsolete things. Signed-off-by: Nils Philippsen <nils@redhat.com>
Signed-off-by: Mark O Brien <markobri@redhat.com>