Remove unnecessary context updates + some junk remaining code;