Cleanup for #2