More code clean-ups

Need to resolve network latency issues