ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE!

So, roll back 690fb4c?