cleanups for multi page rework