Removed references on database and schema