cleanup in RcpApp-7
Merge branch 'master' of github.com:akhikhl/wuff