Move doc deletion to end of deviceprofile evaluation
Move filter entry name/value cleaning to constructor, whitespace change