[WIP] [3.9] Assets removal

This PR is related to #566, I split removal part of the PR to increase redability