Code cleaning (unused import + missing condition). Migration to userdata required asap.