Cleanup #1442