cleanup XML v3 + fix Timer