Update push
Add cleanup trap