removed excessive lines