Scope fix and trash extra props