Removed storage

Need a better solution