removed excessive code