Cleanup, @fredefl is majestic