Removed hcontext-set.
Code cleanup.