Updated checkers
Cleaned cmake lists