Fix build.xml for new layout

Also remove unused APIs