Minimal code cleanup
Intermediary migration to new seneca store plugin