Revert "Cleanup"

This reverts commit 46a0cc1c134411aa7b67a2d97c764614c0ee83f0.