removing some ZF not needed stuff - finishing add to org