cleaned out ZFR stuff and other stuff