Cleaning MKT things

Ref https://bugzilla.mozilla.org/show_bug.cgi?id=1019501