Further refactoring, also remove googleAnalytics (unused)