Remove unsused code