Tiding up after the relocation 2

Signed-off-by: Antonio Uccio Verardi <antonio.uccio.verardi@gmail.com>