Better match downstream
Remove more extraneous references