Clean up. Closes #439