Removed deprecated compatibility layer of some elements.