Remove unnecessary function
Simplify