Cleanup for #6