Cleanup
Implement RDB persistence