Export to java-xplaf
Cleanup