Cleaned cmakefiles