Grinch's over - remove hacks