Removed a ton of unused local vars