complete removal of storage modules from here