minor deletions of unused parts