more removing
Merge pull request #166 from karinlag/2013-07-oslo

more removing