#472 Removed obsolete or commented config