store API cleanup