Replacing their cruft with mine
Removing a few things