Cleanup #1767