Removed hack code