Mostly cleaned up and completed storage.