Improve performance of non-zero indexing. Try to fix Z removal. Fail.