removing unused helper classes
Use java_import for java classes