Tidy up.

Removed unused import.
Tidy up.

Removed unused import.
Check to see if StoreManager initialised already in a compatible manner.