More phone cleanup