Also, removed Jama/TNT, working on cmake