Stray remaining dep on Storable
Cleanups