unwinding some of the worse hacks for some somewhat better hacks