Cleanup of unnecessary variables.