Final cleanup

No more double library downloads. Please assign someone =p