ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE!