Some more cloudstack related cleanups