Removal of some unneeded code and some simplifications

	modified:   ocaml/context.ml
	modified:   ocaml/typer.ml