Removed unused variables to reduce warnings
Remove most warning