Add missing relation between submissions and user. Remove old code