removed unnecessary code left over from earlier efforts at a fix