Remove default block data, should be load in fixtures
Refactor persistence classes to follow new standard