Clean-up of the porting marks.
Video 2