Address ISLANDORA-1045

So, we should at least put in a separate ticket (code task?) to move or delete these?