Fixes issues with Android ICS + and removes un-needed code