remove optional callback nonsense