MODE-650: Clean up