More cleaning of A4 code