Cleanup for #285