Reverting null-changes
Properly resetting resources