Remove Imgur if blocks, plus some cleanup