remove commented (dead code) in this area.