deleted unused parts