Removed join with users