Cleanup up a mess