Trimmed command line UI and cleaned up build.xml