delete unused code.
add checking retuen code.