removed unused portions