cleanup supports nova and neutron

Change-Id: Id49a099a3c413bab18829f9a854278f914e75368