Some cleanup in the attachment loader utility script