removed unnecessary function and comment