Removed unused/commented lines