Cleaning up
Merge branch 'dev' of https://github.com/savi-bcrl/aurora into dev