Merge branch 'adam'
jade cleanup (daryl)