TC removing untidy code