Removed z related stuff