Refactor
Remove unneeded contexts