cleanups for frame 2