Remove java stuff.
Add some nice aliases.
Merge