And remove some obsolete things. Signed-off-by: Nils Philippsen <nils@redhat.com>
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>