Remove obsolete code.
Add OPTIMIZE declamation.
Merge branch 'master' (early part) into bytecode