Improve consumption of overrides to not leave artifacts