Added some CERT checkers and remove some unused functions