Remove unused properties
Move scopeName to the top