2 critic cleanups