* Remove pubsub * Removed unused code * Dispatch removed. * Build fixed. * Namespace fixed and dead code removed.