cleanup alloc/dealloc
Merge branch 'master' of tycho:sources/ccrtp