Strictly NO-OP code cleanups

Signed-off-by: Andreas Tolfsen <ato@mozilla.com>