remove references to draw layout and history view