Cleanup phone.cpp