Partial work on stripping out Z