Remove storage_name from SELECT queries.