Move zf1 stuff out