Channel/Sreq cleanup

I have some plans on cleaning this code all up, but first we have to clean what we have :)