code refactor remove unuse code