Revert "Cleanup"

This reverts commit afd46257f7af89d14c76ee853884aa87716d59d0.