- fixing namespace
- remove property only if present