removed some unused variables and functions contents