Cleaned up DispatchActivity