Cleanup
This is a mess.