enforce auth and other SWORD cleanup #3385