Code and client UI cleanup