Add cleanup method for client ui