Revert "Cleanup"

This reverts commit 14e44deba111d2180d04f15778e607e5e76a6302.