Revert "Cleanup"

This reverts commit ff750dd0d24c7dee38a8577f78427fc909bcb801.