Cleanup for #17