V0.8.4 cleaner...