cleaned up some unused code from old revisions