Cleanup unnecessary variables