[Misc] Removed hack