Revert "New features added"

This reverts commit 40fe39547a921635e99f76be001d734c52555cf4.