removing duplicitous imports and fixing build.xml