Removed things that are managed other ways, and added a few missing.