removed unused parts.