Pld/cleanup odkviewer models