Fix cleanup of PASS
Create a new PASS class on reload