I don't see this being used anywhere new -- keep it protected?