Cleanup and add ant script for jenkins