remove un-used variable
remove return keyword