removed unnecessary function
removed unnecessary functions