Delete redundant code now found in [models].
Update deps.
Minor refactoring updates.