Fix signal/channel creation ordering issue

Cleaned up some cruft too.