Pass clean up