Clean up + Google analtytics