I was thinking renaming `Cleanup` to `Utils` or something - as I don't think there will be all too many cleanup related methods. So collecting a select set of utility functions that might be useful to reuse.