Remove storage location code around