pulled out dependencies no longer needed in the rework