[FIX] Remove buggy features