more cleaning in ts-java