remove unnec code