More unused but set cleanup, and uninitialzed vars