More cleanup in field proxification