removed commented out lines