Updated version compatibility for Java
Cleaned-up imports in files
Clean-up