removed unused parts of codes