Removing another unused variables