moar cleanup
I guess we cannot cleanup more
adding enough dependencies to build collections session