Remove unuse logic