Getting rid of local calls.