Molecule set cleanup and potion tweaking