cleanup and simplification
cleanup and simplification


git-svn-id: cc9b14bf80bb7e006601d17ae5fe0c831f42d334@10 ce739968-150a-4080-b6a2-b8faa43cca6a

rmm5t/strip_attributes,MarshallMcCoy/strip_attributes,mysociety/strip_attributes