Removing currentField in favor of activeField