This is a followup patch for Iec8854749a1df81eb6a7154d3f951e176c69156d that left some other unused code in tree. This patch attempts to remove the remaining pieces. Related-Bug: 2002839 Change-Id: Ie297dfba17deb79b38cf9f6eccf4f1a8e9e5060a Signed-off-by: Jakub Libosvar <libosvar@redhat.com>