Lots of prophunt cleanup