Comment out some obsolete Highlights