IconRegistry, Cleanup and MetaPotions

Haven't tested any of it.