- optimize attribute and cleanup entity tracker (#548)