PIWIK-767 cleanup after review