Level 3 cleanup/rework