Remove unsused code after cleanup