Fixing current_id to current_user.uid, but also removing from model