Revert "Minimal cleanup"

This reverts commit 3e76bf3620a23d2e23801387830c5fc4cfff7c39.
Revert "Sorry missed this in last commit"

This reverts commit dfba02379f5585fb7e46cfa43e7026013eaf415c.