added back force_clean. Fixes #490