Strictly NO-OP code cleanups