cleanup

safeguard changes to not affect ipad.
remove unnecessary temporary