Removed leftover code and cherry picks (#185)
Removed leftover code and cherry picks (#185)

* Updated cherry pick for change 383049

Signed-off-by: Remus Buzatu <442ca000fc34b0239b9e438dbc108749457853bd@gmail.com>

* Removed leftover code and cherry picks

Signed-off-by: Remus Buzatu <442ca000fc34b0239b9e438dbc108749457853bd@gmail.com>

rbuzatu90/neutron-ci,rbuzatu90/neutron-ci,cloudbase/neutron-ci,cloudbase/neutron-ci