Code cleaning
CommonAnalytics included in other modules
Chart helper