Wow, lots of cleanup