Adapt build path to common removal