Removed many untested and buggy features