#196 More cleaning... this is going to be painful