Prune unneeded mapped functions
Tab fix