ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE!

I don't think the ternary is necessary anymore.