Unsused code removed