Remove unused func tokens if not needed