Cleanup, remove al subdir
Cleanup, remove last references to mtc/smpte
Remove asserts