Revert "added obsolete fatures"

This reverts commit 489112b3d20d872a7720fe15d564a3bf27249f97.