Remove commented-out entries, trim whitespace