some minor bug fixes. removed unused header and classes like PhoneUtils. code cleanup