More cleanup in Persona Classification module.