Update function name and remove hack code