Remove separate element stack. Remove redundant overrides.