Removing StorageSetup.java