Level 4 clean up