clean-up 2006

p7092862 p7092852 p7092854
p7092855 p7092860