Removing some direct use of java