finish structure matching, get rid of server cruft