more hacking
remove the stuff not working