Prune more useless functions