Cleanup #1307