In general some missing things to remove (fields) and one not back ported script.
This will create a new commit in order to revert the existing changes.
