fixes
remove storage module
rename function