Add prep cleanup