Removing unused variables...