Add next level switch
Remove unused variables