Remove video support code and doing code formatting