Cleanup for #1