Merge "Removing unnecessary pieces of code from network client"