Removal of unnecessary function