Cleanup storage classes
Cleanup imports