Did Redundant Code changes and Implemented CommandTimeout property