Check calls have changed; Cleanup!