Removed complete hack