This is the result of running eradicate (https://github.com/myint/eradicate) on the code and double-checking the changes.