Removed linguist commented out bits