cleared unnecessary trace calls
prepping for multiple clients