remove unnecessary function and comment