[FIX] Remove unneccessary features