Some cleanups, it still seems broke due to the melange code not working.
Some cleanups, it still seems broke due to the melange code not working.

mc2014/anvil,hagleitn/Openstack-Devstack2,mc2014/anvil,hagleitn/Openstack-Devstack2,stackforge/anvil,stackforge/anvil