more deletions of old, unused code