Removed ST2 support from a bunch of packages.

And also added some missing entries.