Remove some hacks that are now in the packages