Remove some unused vestiges