- Added logic that clears all unresolved variables and also elements containing unresolved attributes