removed various special cases because of lambda support
removed various special cases because of lambda support

davidk01/Nathans-University-homework,davidk01/Nathans-University-homework,davidk01/Nathans-University-homework