Lcnaf clean

Clean, cherry-picked replay of:
https://github.com/hudmol/archivesspace/pull/652