removed un-needed code
added iPad support