Code cleanup. Remoting work.