Cleanup from merging #807