tidying up

removing unused variables and commented out code