Removed field, aesthetic changes