Client stub and moved old code to storage.