Removing deleted stuff.
Adding missing stuff.