Fix moments and remove it from global space