Cleanup

Includes the downloads merge request - since the patches would conflict.