Fix commit "Don't keep garbage datas ..."
Remove a duplicated check
Clean some x,y,z operations