Make the Removal system modual.