initial clean up
remove storage module