Solve function naming problem by removing code. :)