- Finished the cleanup of variables.