Remove more inference