Code cleanup - unused variables
Remove redundant code