Cleared out to prepare for new Java version