Actually cleaned up the mess :p.