Removed unused local variables
Code cleanup