Commented out troublesome lines