Removed state persistence code
First go at clustering