Context and Registry cleaning