ENAVSHORE-7: Clean-up model and untangle from enav-model