Stream+clean-up

Stream Clean-up Project in progress