Removing old print
Tidying up some warnings and unused code
Adding ability to remove an Ethernet-side stream entry