get rid of ZCs and deinitialization issues