Cleanup patches
Update build.xml