Tidy up, setting up for using GCD for image downloads.