Misc clean up
Generalize Expr
Clean up
Generalize Expr
Clean up
Remove testing code