more code cleanup for client application