More cmake cleanups