- removed uploaded filed and subst with control on safety id
- some comment cleaning
- removed listeners to avoid register them twise