Better workaround for possible OM terminology inheritance bug
Remove outdated, unused files
Create NU specific deployment branch