2013.07 - comment out storage support for now