Cleaning up cmake instructions