web context minor cleanup