Basic clean up of custom client code