Remove gdefault and remap specs