preliminary store testing is good
some cleanup