[NOOP] code cleanup