make the code short
remove unuse code