Remove queries.
Change relationship handlers.