Add func value, delete unused code