Fix content policy bug & remove anaylytics function.