Removed old storage references