Cleanup supplied by Thomas a while ago - I hope he doesn't notice how long it took me to apply these