Remove these two huge privacy violations and probably break everything