Removing dependency on cpsuite library