Revert iPad changes back to iPod

The iPad partial implementation was included in the import from
sourceforge.  Those changes are not ready for use.