(remove) Remove more unused java clases