removed some remarked lines