[CLEAN] Remove useless stuff due to previous merge !!