cleanup of old personalization, refactoring