Delete unnecessary stuff imported from ZF