WK2 cmake clean up.