Cleanup 6 ... and more in the future :)