remove a lot of helpers, cache relation relations

cleanup query i hope

update schema

all tests pass!!!