Moved some stuff around
Remove automatic stores