Part 4 of my Store clean-up (finally)