readability, and removed re-configuration filter with the same properties
simplified update of configuration (no longer checking for equality ... didn't work anyway)
removed dead code