More removals of internal exception service