cleaning up after bottles 2 and vs2012