removed unnecessary  code