iPad compat + cleanup