clean up of khaleesi root dir

Change-Id: Iba327b08fff71c577659cfd0395c824b46d83f42