old code comments removed