minor deletions of unused code