change single quotes to double quotes + drop old commented-out code