removed unnecessary  functions