Clean up and tested at oppsal