Remove superfluous context