Changes for new WhatCounts platform; clean up of old files