Consolidate cloud removal code in one file.