Removing unnecessary function