Clean up old stuff; make image loading async