Removed some outdated Java constructs.