Cleaning up cmake usage