Removed clutter and moved configuration to client.cfg