Cleaning up even more unusued code. RIP Wisps