Revert to java, remove modules