removing deprecated unreachable statements
fix for improper case statement generation
missing default