Revert "Cleanup"

This reverts commit d4a05aa57ae65c72fe3e71f381bbcf39484bd198.