Cleanup after merging #393