ant build

And remove dead code