Removed ZTable code