Сlean up unnecessary