NOOP clean up code