Remove advisor
Add some additional assertion messages
Merge branch 'master' into sauce