Remove snapshot and no layer store singleton

This is all heading towards making my life easier for the actual task on the board :-)