Remove raven
Merge branch 'pasr' into bdis