Revert "Cleanup"

This reverts commit f0860621ecad3e25a4e87ac1e59e719a5fbb9b42.