Update to remove Java ... manage this manually