I think we can actually remove this file now. I can't think of what having two interfaces buys us.