Added extra cleanup actions (as described in cloudstack docs)