Remove logic, fix hittable