Remove Google Analytics & minor changes