Should this line and the above be removed, since you are not using this logic anymore?