remove debug output; autocomplete in more contexts