Some small deletions left over from porting across