removing unsused code