Revert "Cleanup"

This reverts commit 4c4d889eaa4dce93d59e030902f734d62a0addcc.