Fix exports, remove deprecated.