Cleanup custom flags