removed outcommented lines