Finally killing all the spurious displays I think