WIP cleanup cas storage