removing obsolete items.
Merge commit '2dd3338f0c9fae59cb3009a68a3beddf19b2be29'