more cleanup in cysfw