Cleanup base and java builds