Remove need for USER_ID header