Cleanup #411