Remove delimitmate and add autoclose