Final code & file Clean-up for Client version before Release