code cleanup
added !cluster using Activate persistence framework