Clean up / branch for EL7

Signed-off-by: Lon Hohberger <lhh@redhat.com>