Replace old methods with the new module's methods.
Update copyright and simplify.