Cleanup dependencies and ant scripts