further cleanup of the ER diagrams