Clearing old code on client.
Merged.