more cleanup, try to get cmake working