Cleanup for #383