Revert "Cleanup"

This reverts commit e0ffc639e04d4794d7f934d79ddb3ae5d913a8ad.