Remove unnecessary LambdaCase
Clean up