Revert "Needed more features"

This reverts commit dd0a7521570cd7268dcbc44548459495ae898a5c.