Clean up
Closes #418