obsolete boilerplate conditional markup removed