Remove unnecessary function