removed unnecesary save/restores