Revert "Cleanup java classes"

This reverts commit d04a9b38f7c202180e4ee17d98f5a85374f4dddb.