Cleanup. Wish I had more time for this!