Remove attrsets scattered around Display.update