more delegate cleanup