Remove remaining code from porting.