Changed userId to User with cascade on remove