getAccountRemovalAllowed problems on API > = 16

temporary fix and some unused code removed