More cleanup on pushRef