Remove some unused
Move some cmake things to modules