Cleanup of Account view and API generally.