Remove rendering overrides

Change-Id: I4e01500fd6b21c883b0509daa414738f7f58b254