Deprecate unneeded elements