clean dead code and whitespaces
clean dead codes and whitespaces