shooter: cleanup and update storage for cm-11.0