Cleanup unused variables...