Get rid of some more cid

Signed-off-by: anerik <anerikgames@gmail.com>