Fixed problems in code occurring because of previous merge not removing variables moved to the alincodictionary file