Clean up. Closes #430