WIP: cleaning up cmake