removed lines that had been commented out