Cleanup #1267