Remove stupid JOIN