removed unnecessary references and warnings