some commented codes left from previous update is removed.