Remove old return and match expander