cleaning up unused variables....