[FIX] remove stuff