More ant code clean up