Thinking out loud... Why are we doing this cleanup?