Remove changes for (disabled) 'overlap' code for syntax highlighting