clean and simplify a lot of code.  fix a bug with vpc and createvolume