FIX pubSubs and adding redirection trick
Removes redirect stuff from internals