Don't mess with non 3rd party stuff
refactoring