Cleanup of RecommendationEngine api