Revert "Added a lot of new features"

This reverts commit 26ba0e8df1e0e802ee84ce6c32843c7e936df2e4.