code reformat, removed code not available on older android api