Code Cleanup: Model Plot

.. used XXX as warnings rather than todo.