Cleaning Up. Map and Call working. (Android only)