moving things around and removing an expected field