is this still necessary?
I suppose, the cleanup is still in the next steps