deleted helpers
demo without joins added, some more refactoring