Remove more z stuff