last cleanup

not needed any more due of world phone support

Change-Id: I96ca2e5dba7542e0749bb546710d3ef65a53f064