AUI-1163 Partial remotion