Remove the concept of context which has seemed to simplify the utilization greatly