Remove comments
Temp: support type variables for java classifier
Fix errors
Drop useless field
Do not resolve class if it does not need