clean up of Asset- and ModelController