current_user.id and cleanup