Remove z axis issue from TODO