Remove some COD stuff