More potion cleanup