Don't track post type as a distinct property from image source type, we can combine the two into a single property and clean things up a bit
Remove unused delegate implementation