Cleanup for #5