-Some code cleaning to remove old ipal implementation.