Cleanup for #313