cleanup
BUG. Context was not persisted