Remove derived data.
Get in sync with derived data being removed.
Merge master into 1