removed todo (handled elsewhere)