Cleanup imports (and add missing glance.store.filesystem import