[#67767620] Removed enhanced table