remove store stubs
simplify store