Fixed; remove traces